From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 3 Oct 2004 01:21:28 +0000 (+0000)
Subject: (rmail): Convert Babyl files using decode-babyl-file.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~8790^2~196
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d688e7ad93beb34911c1c65726be32861ffefb3a;p=emacs.git

(rmail): Convert Babyl files using decode-babyl-file.
(rmail-use-spam-filter): Add defvar.
---

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index fe6805c8de6..bba3f24ccbf 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -598,6 +598,9 @@ The first parenthesized expression should match the MIME-charset name.")
 
 (defvar rmail-enable-multibyte nil)
 
+;; Avoid errors.
+(defvar rmail-use-spam-filter nil)
+
 ;;; mbox don't care
 (defun rmail-require-mime-maybe ()
   "Require `rmail-mime-feature' if that is non-nil.
@@ -674,9 +677,10 @@ If `rmail-display-summary' is non-nil, make a summary for this RMAIL file."
       (setq run-mail-hook t)
       (rmail-mode-2)
       (goto-char (point-min))
-      ;; If file starts like a Babyl file, reject it.
-      (if (looking-at "BABYL OPTIONS:")
-	  (error "This is a BABYL file; use M-x unrmail to convert it"))
+      ;; If file starts like a Babyl file, convert it.
+      (when (looking-at "BABYL OPTIONS:")
+	(erase-buffer)
+	(decode-babyl-file file-name))
       (goto-char (point-max)))
     ;; As we have read a file by raw-text, the buffer is set to
     ;; unibyte.  We must make it multibyte if necessary.